Fix Rmail to handle capitalized months in Date lines.

diff --git a/debian/changelog b/debian/changelog
index 804e9c22c0be760fc17a0b4d5f238aa65ca74411..49a6ae3988a8a079e8d4ebd0c909e66214a612f2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,12 @@ emacs23 (23.1+1-3) unstable; urgency=low
     KOHDA <kohda@pm.tokushima-u.ac.jp> for the initial
     report. (closes: #539851)
 
- -- Rob Browning <rlb@defaultvalue.org>  Tue, 01 Sep 2009 21:14:54 -0700
+  * Fix Rmail to handle capitalized month names in Date lines,
+    i.e. "Date: Thu, 06 Aug 2009 18:33:32 +0100".  Thanks to Jeroen
+    Nijhof <jeroen@nijhof.uklinux.net> for the report and Sven Joachim
+    <svenjoac@gmx.de> for the fix. (closes: #540234)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Thu, 03 Sep 2009 21:55:25 -0700
 
 emacs23 (23.1+1-2) unstable; urgency=low
 

diff --git a/debian/patches/fix-rmail-capitalized-month-names.diff b/debian/patches/fix-rmail-capitalized-month-names.diff
new file mode 100644 (file)
index 0000000..c8f3b80
--- /dev/null
+++ b/debian/patches/fix-rmail-capitalized-month-names.diff
@@ -0,0 +1,40 @@
+* Rmail can now handle capitilized month names.
+  Patch: fix-rmail-capitalized-month-names.diff
+  Provided-by: Sven Joachim <svenjoac@gmx.de>
+  Originally-reported-by: Jeroen Nijhof <jeroen@nijhof.uklinux.net>
+  Date: Thu, 06 Aug 2009 22:51:47 +0200
+  Added-by: Rob Browning <rlb@defaultvalue.org>
+  Status: incorporated upstream
+  Bug: 540234
+
+  Rmail can not handle Date lines that have a capitalized month name
+  like "Date: Thu, 06 Aug 2009 18:33:32 +0100".
+
+Index: b/lisp/mail/rmailsum.el
+===================================================================
+--- a/lisp/mail/rmailsum.el
++++ b/lisp/mail/rmailsum.el
+@@ -518,16 +518,19 @@
+    (concat (save-excursion
+            (if (not (re-search-forward "^Date:" nil t))
+                "      "
+-             (cond ((re-search-forward "\\([^0-9:]\\)\\([0-3]?[0-9]\\)\\([- \t_]+\\)\\([adfjmnos][aceopu][bcglnprtvy]\\)"
+-                     (line-end-position) t)
++             ;; Match month names case-insensitively
++             (cond ((let ((case-fold-search t))
++                      (re-search-forward "\\([^0-9:]\\)\\([0-3]?[0-9]\\)\\([- \t_]+\\)\\([adfjmnos][aceopu][bcglnprtvy]\\)"
++                                         (line-end-position) t))
+                     (format "%2d-%3s"
+                             (string-to-number (buffer-substring
+                                                (match-beginning 2)
+                                                (match-end 2)))
+                             (buffer-substring
+                              (match-beginning 4) (match-end 4))))
+-                   ((re-search-forward "\\([^a-z]\\)\\([adfjmnos][acepou][bcglnprtvy]\\)\\([-a-z \t_]*\\)\\([0-9][0-9]?\\)"
+-                     (line-end-position) t)
++                   ((let ((case-fold-search t))
++                      (re-search-forward "\\([^a-z]\\)\\([adfjmnos][acepou][bcglnprtvy]\\)\\([-a-z \t_]*\\)\\([0-9][0-9]?\\)"
++                                         (line-end-position) t))
+                     (format "%2d-%3s"
+                             (string-to-number (buffer-substring
+                                                (match-beginning 4)

diff --git a/debian/patches/series b/debian/patches/series
index 8d214d980ceae63634fa5028733bc2a3e6a1f299..33504f65429c207340037afbeb900c0b7128ed0d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,5 @@ avoid-fakemail-mail-loss.diff
 version-mention-debian.diff
 look-for-news-to-find-etc.diff
 fix-flymake-xmlstarlet-invocation.diff
+fix-rmail-capitalized-month-names.diff
 autofiles.diff